Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vcs2d interactions updated #1091

Merged
merged 199 commits into from Mar 2, 2015
Merged

Vcs2d interactions updated #1091

merged 199 commits into from Mar 2, 2015

Conversation

aashish24
Copy link
Contributor

No description provided.

chaosphere2112 and others added 30 commits February 25, 2015 12:43
	vtk_ui package included in install
	buttons now set state correctly on copy
Configurator intercepts click events on the canvas
It then determines what DP template attribute was
clicked on.

It logs double clicks, and then will "activate" that member.
Removed old configurable code for template

Changing tactics on how to approach configuration;
moved configurable logic out of template, will move to
attributes directly.
Can now detect clicks in arbitrary fillarea polygons
UI Widgets now render on their own renderer; not quite ironed out the
issues with that technique yet, but the renderer is contained by the
manager class, which is a singleton per render window. Also created the
editors subpackage, which integrates vtk_ui elements directly with the
things they that can configure, starting with the fillarea.
UI widgets will now show up on the top most layer, and will actually
persist between canvas.update() calls. Woo!
Allows editing of color and fill style, though that appears to not work
properly currently.
Extracted click/drag logic into mixin classes. Other editors will be
able to use the exact same logic, woohoo. Interacting with a toolbar is
still a bit fiddly, and there's tons of flashing; what's that all about?
Integrated into editors.fillarea and editors.line
Renders box on each tick of drag, decreased drag buffer zone
Sam Fries and others added 20 commits February 25, 2015 12:50
Fixes some whitespace issues that were left behind as well

Conflicts:
	Packages/vcs/Lib/VTKPlots.py
…actions_updated

Conflicts:
	Packages/DV3D/data/coastline/high/ne_10m_coastline.README.html
	Packages/DV3D/data/coastline/low/ne_110m_coastline.README.html
	Packages/DV3D/data/coastline/medium/ne_50m_coastline.README.html
@aashish24
Copy link
Contributor Author

@chaosphere2112 it seems that you may not have the developement hooks setup correctly? I fixed few things (whitespace, end of line, file size issues etc). Did you run SetupForDevelopement.sh script?

@aashish24
Copy link
Contributor Author

@chaosphere2112 these are the tests failing:
298 - vcs_addons_preview_2x2 (Failed)
299 - vcs_addons_test_12_plot_one_leg_per_row (Failed)
300 - vcs_addons_test_12_plot_one_leg_per_row_right (Failed)
301 - vcs_addons_test_EzTemplate_12_plots_margins_thickness (Failed)
302 - vcs_addons_test_EzTemplate_12_plots_legd_direction (Failed)
303 - vcs_addons_test_EzTemplate_12_plots_mix_glb_local (Failed)
304 - vcs_addons_test_EzTemplate_12_plots_spacing (Failed)
306 - Hovmoller_volume_test (OTHER_FAULT)
307 - dv3d_vector_test (OTHER_FAULT)
308 - dv3d_slider_test (OTHER_FAULT)
309 - dv3d_volume_test (OTHER_FAULT)
310 - dv3d_surface_test (OTHER_FAULT)
311 - dv3d_constituents_test (OTHER_FAULT)
312 - dv3d_hovmoller_test (OTHER_FAULT)

@aashish24
Copy link
Contributor Author

With my latest fix: only these now:
298 - vcs_addons_preview_2x2 (Failed)
299 - vcs_addons_test_12_plot_one_leg_per_row (Failed)
300 - vcs_addons_test_12_plot_one_leg_per_row_right (Failed)
301 - vcs_addons_test_EzTemplate_12_plots_margins_thickness (Failed)
302 - vcs_addons_test_EzTemplate_12_plots_legd_direction (Failed)
303 - vcs_addons_test_EzTemplate_12_plots_mix_glb_local (Failed)
304 - vcs_addons_test_EzTemplate_12_plots_spacing (Failed)

@aashish24
Copy link
Contributor Author

With my latest fix, all of the tests are passing now. Merging it.

aashish24 added a commit that referenced this pull request Mar 2, 2015
@aashish24 aashish24 merged commit a0d80b9 into master Mar 2, 2015
@aashish24 aashish24 deleted the vcs2d_interactions_updated branch March 2, 2015 13:37
@chaosphere2112
Copy link
Contributor

@aashish24 I do on my work computer, but not my personal, I'd wager. Thanks for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants